[#53049249] Fixed scrolling and some category filtering