Updates to filters and added stopEvent directive