Fixed filters and type ahead
Updated toolkit