Some code cleaning. Also blur onl filter select