Fix for alternate queries.