+ extraKeys for Fx functions; queries fix