fix wrong where statement
add key map