Make the permissions screen generic
Make query lookup generic