Babitha: Modified queries