many fixes to target handling
Merged WFSGrid work