Removing unecessary check for feed query var
Clean up concatenation a bit