added button filtering