Made lighter queries when possible.