Fixes for fetching after add