Fix select bugs most