Added specs for staring and unstarring queries
Merge