groups/entities issues in search/entity fixed