Changed braces and moved filter #4933