Add populate filter list and code tidying