Added support for select handler other than "select"