Respect filter settings also in synchronous loading
Minor refactoring