Added more query parameters to entity