Update for suggestion on pull request

Added a query to retrieve facets if they have not already been set by the time the call has been made.