Added some TODOs
Will now relayout on upon redisplay if query result has changed in the meantime