* fix: skeleton loader issue * fix: simplify logic Co-authored-by: Peer Richelsen <[email protected]>