Updated to work with new droidQuery changes