Tidied up asset manager filters