fixed filter for #736 and tidied layout a little bit