Conditional check for normalization in redirect queries (fix #47)