Import settings from hub staging server
Handle and/or queries properly in add_filter()

Previously we ignored that