Bug fixes for 4.3.4

Update code for Fx 20, fix bug with requeries, several UI improvements