Add sort options to tags and remove project from queries