Fix queries for stickies
Fix return value checking