Improved filter and having.
Fixed limit.