Better library home blocks behaviour