More precise regex filtering again