Move all select options to Generic helper

Signed-off-by: Prashant Shah <pshah.mumbai@gmail.com>