Fixes for filter option loading and nested filters. Fixes #447, Fixes #412