Adds compose activity
Fix query order