Adjusted reg. exp. to improve filtering