Better regex for query detection
Fixed opt -> options typo