remove pointless ternary
remove query string lookup