fixed filtering to allow chaining - fixed spacing