Tidied/added filter exceptions.