added filter and layoutchanges