Fix for select all feature