Bug fixes for Select type feed