Moved to seperate filter window, maybe time for a review...