Updated for latest droidQuery changes