Merge "Update DatabaseLoader querying."