improve query regexp example