Added more filters to smart control handler