core changes, created filter builder