Fix a couple more filter_by queries
Fix a bunch of config options that should return None instead of 'None'