Changing how select works for client

Changing how select works for client