Sinlge select fixes for slow service