Limit fetching

Try to only fetch when necessary