Shift behavior fixed, selection of alternates added

Signed-off-by: MishkaRogachev <mishkarogachev@gmail.com>