Fixes related to bouncing of keywords edit