Fix for a couple of bugs related to presentation of Gecko entries