Location entry done for now. More to do during bug-fixing [Fixes #66958536]