Also aligned query naming to start with model in use. Also added created/updated sort options to roles.