added fixes and filter